From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 27 Nov 2006 02:43:36 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 1.31.0-rc.0~55069
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=4ce2ae3eb1f32dd6590d436e702f17cc38f66bba;p=lhc%2Fweb%2Fwiklou.git

---

diff --git a/includes/Block.php b/includes/Block.php
index 592471cf80..97b1f43e91 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -241,10 +241,10 @@ class Block
 
 	/**
 	 * Determine if a given integer IPv4 address is in a given CIDR network
-	 * @deprecated Use IP::isAddressInRange
+	 * @deprecated Use IP::isInRange
 	 */
 	function isAddressInRange( $addr, $range ) {
-		return IP::isAddressInRange( $addr, $range );
+		return IP::isInRange( $addr, $range );
 	}
 
 	function initFromRow( $row )
diff --git a/includes/IP.php b/includes/IP.php
index 5bd2a2363f..14addb9496 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -214,7 +214,7 @@ class IP {
      * @param $range The range to check the given address against.
      * @return bool Whether or not the given address is in the given range.
      */
-    function isInRange( $addr, $range ) {
+    public static function isInRange( $addr, $range ) {
         $unsignedIP = IP::toUnsigned($addr);
         list( $start, $end ) = IP::parseRange($range);